Fix double handling in collect_tokens
#129346
+196
−174
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.